Merge pi-dev-plus-aosp-without-vendor into stage-dr1-aosp-master
am: ee6728562d

Change-Id: I5f291b67915bec1928a4789acddc91d4cb87b3a8