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

Change-Id: I11633cfd5b45107c1d625640642c0f36c8929d76