am 4a4edbbf: am 7fecf5f4: Merge "Make addAddress locale safe"

* commit '4a4edbbfce2e1a8b34b5b9ff2793eace303dae5a':
  Make addAddress locale safe