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

Change-Id: If0196e8faa2f57888eac653b49b8c58a6aee2d2c