am c77c7183: am 571866cd: Merge "Make locale safe paths"

* commit 'c77c7183fd9ac17e610206d7308089087fb3db6b':
  Make locale safe paths