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

Change-Id: I774ca8da400c1a5c2820549fbbd6a12094ade0b6