Merge "Add modify string to resources." into oc-mr1-dev am: 9e47d2c233
am: 06917056fd

Change-Id: Ie464ce313d3145b804e53420033a2d705589344f