Merge "Remove unused strings." into rvc-dev am: 124f3e883c

Change-Id: I29f3c426278553eaafe4966c01f33b1c969f0e68