Merge "pass --locale argument to recovery" into jb-mr1-dev