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

Change-Id: I515149830eda66e33676f8847b399c8702404855