Merge "Remove duplicate string resource." into oc-dev
am: add296d92e

Change-Id: Id251c910ffe6bc0fb211c48d2b51d804ff84517c