am 70c1f083: Merge "Set the system locale correctly even on an encrypted device." into lmp-dev

* commit '70c1f083332729a586d670af7565732a2eb06ab4':
  Set the system locale correctly even on an encrypted device.