Merge stage-aosp-master into pi-dev-plus-aosp
am: 82e2c2d2c2

Change-Id: Ie106480fd63a93a63a0ff2e429c3492cdec7d5f3