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