Merge stage-aosp-master into pi-dev-plus-aosp
am: 90d5326b0e

Change-Id: Ida36a254d21c2d654ddc0874ba47a700abd0f4be