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

Change-Id: I0498efe39393c13a50e217109663ceb444b26a7c