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

Change-Id: Iedb7eabb26ce24d7a706cc2db732ebba91132288