Merge "recovery locale handling fixes" into jb-mr1-dev