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

Change-Id: I5b74d9c13c861bdff2014acf7f051da05e63715f