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

Change-Id: I229b0f5c1c473ae16867896dd8a722fef9b53a6c