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

Change-Id: I2977d55f1e1aa032938c25a357ae399d16dabf7e