Merge "Fix a bug where the legacy extra info is reset on connect." am: 67370a01 am: a5f7fcac am: a072ef0c Change-Id: I0406172efbdbbffe5db66efc3b94844bf14d6f04