Merge stage-aosp-master into pi-dev-plus-aosp
am: 52ec701d22

Change-Id: Ic60be03e3c32212ee1d24e8a01f0d57226a37ede