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

Change-Id: Ia0a2afe359cac6adfd33d2f839eddb8bd14b5f43
tree: cebfdf174938161515f4a0afc98dbba0f9bbda24
  1. core/
  2. services/
  3. tests/