Fix a bug where the legacy extra info is reset on connect. am: ee171cad am: 110885d6 am: 1e1a7088 Change-Id: I706661c90fd76835d71a9589cc3a93d466e18ed4