[automerger skipped] DO NOT MERGE - Skip pi-dev@5234907 into stage-aosp-master
am: d6900cc305 -s ours
am skip reason: subject contains skip directive

Change-Id: Ib7e13cbe447e0a35d48851914b0845bf73fc7ee2