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

Change-Id: I99ca63cb691e04900241b2f62351d71357c0f751