Reorder city, state, zip.

Change-Id: Id609523590a8c38c8cdf1ed489bcf66c15d679d8
Merge "Reorder city, state, zip."