Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
am: 44de687b93

Change-Id: I9aca24c1ee7a0ce46d8a7845ba78735fd03410c7