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

Change-Id: I8d8faa9a721d61d2f891cdc4660b60b9c894d91d