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

Change-Id: I90cbb79e2ecc716cce7a34340d02fd225181ae39