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

Change-Id: I57ccf3498e1793edb1eeb321dbe6b82df59f4747