am 5defa1cb: am 3e970d64: Merge "Dont use the default locale when formatting SQL statements"

* commit '5defa1cb5f0de2bea82e35b6af18e178c18bedd6':
  Dont use the default locale when formatting SQL statements