Merge stage-aosp-master into pi-dev-plus-aosp
am: 3a38b1d7ea

Change-Id: I2f65bbd65b3de49e55b9a45f9fd3c82fcebeb132