Merge "improve the format of locale argument when calling recovery" am: 032c7a0a18 am: 1cd3a93288 am: bc0865bc78
am: ee45a1f3ab

Change-Id: I2abd77840eb8199fe814e02f8a552d30f1c2c190