Merge "Ensure connection extras set before connection start are passed...
Merge "Ensure connection extras set before connection start are passed through." into mnc-dr-dev am: 43e36576
am: 3f1fba09
* commit '3f1fba09':
Ensure connection extras set before connection start are passed through.