Merge stage-aosp-master into pi-dev-plus-aosp
am: 42bae9665c

Change-Id: I5cb212c77d8af05fd73439ea06433b9cdd32c21d