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