Merge "Merge "improve the format of locale argument when calling recovery" am: 032c7a0a am: 1cd3a932 am: bc0865bc" into oc-dev