[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master am: 6dc9211625 -s ours
am: 60ce5440ff -s ours
am skip reason: subject contains skip directive

Change-Id: Ic270f9b1888f826db3473a8b04cb86f36797c8d2