DO NOT MERGE ANYWHERE Mark AutoConnParamUpdateAddr on first auto connection...
DO NOT MERGE ANYWHERE Mark AutoConnParamUpdateAddr on first auto connection param update am: daae184a -s ours
am: 49bd3d12 -s ours
Change-Id: Ieea4194c4ea69e72f92a21dbd08eff94d390a02d