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

Change-Id: I127bf621caa39a24265f30cd4c781248410e5348
tree: 2d984eeca60b602a08b94acde2b8083c0ad74f0e
  1. core/
  2. services/
  3. tests/