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