Merge stage-aosp-master into pi-dev-plus-aosp
am: 9519c61d4c

Change-Id: Iacc017149c304749da73928f505fdbf03f3b3ff5