Merge stage-aosp-master into pi-dev-plus-aosp
am: 7c9e109202

Change-Id: I6b8df3261cf63dbc04b5cd7db7ee2be20c56ad56