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

Change-Id: I3dd62df8b9bb89936c1c722849bfa921bc8b3e6d