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

Change-Id: Iff1cd5adfafff44eac62222ec06613b3735f2de9