Merge stage-aosp-master into pi-dev-plus-aosp
am: 975ef619de

Change-Id: Ia2a0976e83f2ffd703e440739278061b0c5c98dd