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

Change-Id: I49ddf66b84bf9c9357af97e2871cc90f9bc98cd1