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

Change-Id: I6554325154802e19fcfa06310fe3fd2b6631f850