Merge stage-aosp-master into pi-dev-plus-aosp
am: 61b3c40dab

Change-Id: I89df041c2cd2566829c293bc005b5804f8488a3b