[automerger skipped] Merge "Remove calls to setRoaming." am: dd388824 am:...
[automerger skipped] Merge "Remove calls to setRoaming." am: dd388824 am: ef585603 am: 9476b6c6 -s ours
am skip reason: Change-Id Id48c1584d7a3fcc1511a68fa40bcca695947fcdb with SHA-1 7b2d0ceb is in history
Change-Id: I14ed42553b8c4c77d76496d626b985089632bf72