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

Change-Id: I2ee63c5e7dc8ffa788af390d4622af9c191c351c