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