Merge stage-aosp-master into pi-dev-plus-aosp
am: 0e3567c3b1

Change-Id: I172e4f4ab9b53a21bff03eae33cec3350ac759b6