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