Merge "improve the format of locale argument when calling recovery"
am: 032c7a0a18

Change-Id: I54389601ac5234b872701762e928a3ea7ff2f307