Merge stage-aosp-master into pi-dev-plus-aosp Bug: 126125118 Change-Id: I31417836ae91480839043d1ecc639ca06cd6de4e