Merge "Remove unnecessary strings" into rvc-dev am: 19df52400d am: c6a476a706 am: fba39cd0e3

Change-Id: Ide965f1987e50a325a489e40714944ac8b4a5cb7