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

Change-Id: I5c01daae7b6c6e5a54f0ed5a0bf861f7985634b9