[automerger skipped] Fix a bug where the legacy extra info is reset on connect. am: 910aad052e am: 4e3606f45d -s ours am: 92c573a0da -s ours
am skip reason: Change-Id I3e437f0fe2eb28f1d621551a8daf164a06af83fc with SHA-1 910aad052e is in history
Change-Id: Iab3109f7dc24bf24a536ab8f3871a48cc482eb97
This commit is contained in: