Merge "String update for effect suppressors" into pi-dev
am: 17b2f5d427

Change-Id: I0c544f10fc14ab59bbcc997991b4f30701cb37b8