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