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

Change-Id: I00a720f89e6ea721a15845bcb9470b97d2dc9b7f