Merge stage-aosp-master into pi-dev-plus-aosp
am: 1aeae2c94d

Change-Id: I7d81885bddb5edce7943bb22dc0af33e43cf7c9a