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