am e7c4f8ca: Merge "Make locale safe paths"

* commit 'e7c4f8ca0660298604b0081a80591b39aefda661':
  Make locale safe paths