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

Change-Id: I89e3a047b149b3435b6a1ff71bb5b7c041534f43