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

Change-Id: If7b0319bc9de34730e62b008d37b9d0dd44a0051