[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master am: b1e077dd00 -s ours am skip reason: subject contains skip directive Change-Id: Ib8e9b9f17cfcb0702719a8d4afc196575af430ed