Merge \"Set extra on connection.\" into nyc-mr1-dev
am: c18df9cf6e

Change-Id: I7049c4f89df51260c9fa4c7c8b8ae4fdc021a51b