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

Change-Id: I4a2dd860bdf4ebdcc6ab420d162579307734fa6f