Merge stage-aosp-master into pi-dev-plus-aosp
am: 42c742d7de

Change-Id: I8ed5f6e10f1aa01ba13ee8bd33185467017a53a2