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

Change-Id: I5b7d25550a3e872c97e3ebd68bfb0ecb95e3fd62