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