Merge "Match network roaming state to avoid wtf()."
am: cd797a5069

Change-Id: I6796d37e4458ef4da16d16f4c0f2bdd495007515
tree: 6debce847173c09c02afde241337ab397a063a1d
  1. core/
  2. services/
  3. tests/