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

Change-Id: I92794e515d0cbab71b5cb1a0eeb465421bda1e39