Remove duplicate strings

Change-Id: I472f25bb9db64a2aba1d961f245bbedba27167b3
Merge remote-tracking branch 'upstream/du44' into du44