Merge stage-aosp-master into pi-dev-plus-aosp
am: 57c0d2d54d

Change-Id: I2c1d007fd31301d8e8815e890b5e4bcbb4b810d6