Merge stage-aosp-master into pi-dev-plus-aosp
am: 761fe364d3

Change-Id: I52a49d45417f8a21d4ff03ac4b1a0db758d38a38