Merge stage-aosp-master into pi-dev-plus-aosp
am: 382b66ce8c

Change-Id: I8e7354262e28795ff9dd4b4842583b3008360c5f