Merge "Change radio related service names to slot1, slot2, slot3..." into...
Merge "Change radio related service names to slot1, slot2, slot3..." into oc-dev am: be74f02a -s ours
am: 4d99696c -s ours
Change-Id: I1be869cc00ecb8ba686a8b2e32a67725e300e353