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