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

Change-Id: I3d00c1b4a146f5e43543da851423d5655606f67c