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

Change-Id: I240e926e3d0d36b31c54e914d61855ddce136172