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

Change-Id: I04247a01f6a93001079429b1ee40f28afc877dcd