Merge \"Address API council feedback (continued)\" into nyc-mr1-dev
am: 01e51e59dd

Change-Id: Ia3a6d4eb224667956eebd6b935628a2ba40dfb18