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