[automerger skipped] Fix a bug where the legacy extra info is reset on...

[automerger skipped] Fix a bug where the legacy extra info is reset on connect. am: ee171cad am: 110885d6 am: 1e1a7088 am: 0de64390 am: f2fa8047 -s ours

am skip reason: Change-Id I3e437f0fe2eb28f1d621551a8daf164a06af83fc with SHA-1 a3fdb94a is in history

Change-Id: I972d2ae7b8daab5d4678f10382d68bacb5790274