Merge stage-aosp-master into pi-dev-plus-aosp
am: f4eb173c45

Change-Id: I4587a9ac221f012769aad1a2c712237c88ddc40d