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

Change-Id: I706cc2b15a79dde7a9ed334aa1c07ef1fc5db7ae