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

Change-Id: Iecf827732f3965e26d712f630f424963c953dc93