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

Change-Id: I39c3522a9c58266295009d5023ebe5c027d2e432