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

Change-Id: Iaef4efa2b406df639734491c3cf2a3de4877fe61