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

Change-Id: I5b67dfe2338627ca73153720f93e303be3142342