am aff4dbb0: Merge "recovery locale handling fixes" into jb-mr1-dev

* commit 'aff4dbb0ae33e55785d1a11f93c1e20ebfed4a90':
  recovery locale handling fixes