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