Merge "Fix a bug where the legacy extra info is reset on connect." am: 67370a01cb

Change-Id: Ia0a2afe359cac6adfd33d2f839eddb8bd14b5f43