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