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

Change-Id: Idbdaffccfb64c12c31dd78f443c7c814c5787ef4