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