Merge stage-aosp-master into pi-dev-plus-aosp
am: 643dcf1cf0

Change-Id: I5bb8e7d64daa274bba792e044ebacb85002180a4