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

Change-Id: Ib1f3cc2568908cd781c4eab9100af8dddb4e6cae