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