[automerger skipped] DO NOT MERGE: Merge pi-dev-plus-aosp-without-vendor into stage-dr1-aosp-master
am: f2e1dc6c33  -s ours

Change-Id: Id258eacff03786bfd9ef46ed7a08df24cd212638