Merge stage-aosp-master into pi-dev-plus-aosp
am: 179923ebab

Change-Id: Iac07f28759d8c0588831b81a728981ec46aeda5d