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

Change-Id: I9589036f08e0b2479e018b6272699f163f41f861