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

Change-Id: Ifaf14cb209f03c5714e5b44ddd16c249a61eca6e