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

Change-Id: I919bdfa04ba38b29d1ecee53df67e95ed2b902b3