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

Change-Id: I6796d37e4458ef4da16d16f4c0f2bdd495007515