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