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

Change-Id: I54e3ac25981eb145603929d274676b31369e76af