Merge "Fix error message strings" into oc-mr1-dev am: f841ea86f4  -s ours
am: 77a1f074ee  -s ours

Change-Id: I54fc187d7b5cf54b3ab9c83995f4fbedb695f8a9