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

Change-Id: I95deee158892954c5fb24a5b94668b66a731d3c7