Merge stage-aosp-master into pi-dev-plus-aosp
am: 5f57f889ea

Change-Id: Ifeaf7925f8bd56e7792d0d107a2175ae6e2ffc97