Merge stage-aosp-master into pi-dev-plus-aosp
am: 4d05f99195

Change-Id: I69ba25997c8618f2b2ee3d32e600ae1120fbdf28