Merge change 6906 into donut

* changes:
  location: Add sub-locality, sub-thoroughfare and premises fields to Address class