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

Change-Id: I014db19f384af98a87003bb5f79ad074537318ee