am b82759a0: Merge change 6906 into donut

Merge commit 'b82759a051f55852dabe201ad3354ea9b7b2979d'

* commit 'b82759a051f55852dabe201ad3354ea9b7b2979d':
  location: Add sub-locality, sub-thoroughfare and premises fields to Address class