Merge "Cutout emulation: string changes and ordering" into pi-dev
am: 8d82158036

Change-Id: I6d6c191e1dc511d2ab6e563f7bbea27962fe7b63