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

Change-Id: Ib7237cb38b89f7418d0522da087f6cfa30e4c969