Merge "Merge "improve the format of locale argument when calling recovery" am: 032c7a0a18 am: 1cd3a93288 am: bc0865bc78" into oc-dev
am: b25b2f2dab

Change-Id: I97915632d1dfac51cac8cfa36cfc2465c67572d3