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