Merge "Cutout emulation: string changes" into pi-dev
am: 9c5b761f29

Change-Id: If5b8bfdeea037f42f5bb0a1123b7e96cbc0b5b2a