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

Change-Id: Icc882c20debeca69b9527dfce57664f6cd3d7573