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

Change-Id: Ia9c1808f01633ff3077d42f1ad6212fb3bd0cc93