[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master am: 2ca4601ecb -s ours am: 22165a84db am: de80b93967

Change-Id: Ibe6e0bd8e968b23652e6bb334555c7a2efc72fe8