Merge stage-aosp-master into pi-dev-plus-aosp
am: 68e8399ffa

Change-Id: Ic3075aad272fbd5ae7e3de7da6b8a5c6311c9769