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