Merge stage-aosp-master into pi-dev-plus-aosp
am: 784bf088b7

Change-Id: I865d67ecc6e80fde57f7510401ea9f17cfe4a292