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

Change-Id: Ia1d7b40a3bfb420d2297609d816a4f03334b1b35