Merge stage-aosp-master into pi-dev-plus-aosp
am: c7e927bbe5

Change-Id: I20d11c12d4a22cfe9e21e0e9deb2a587981965ec