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: I029185f7f73eb115041e191853b1cb847e9f0557