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