[automerger skipped] Merge "Cutout emulation: string changes and ordering" into pi-dev am: 8d82158036
am: 80c53bce68  -s ours

Change-Id: Ie247f02047b3d1f646dbdd762e94d9daac6ff18b