Merge "Telephony: Upgrade: Also migrate empty strings" am: 7a523ca147 am: c5310b7bd3 am: d4acd79aeb

Change-Id: I20f2456b9961a46e18e7f89b1b4e9c88671e6561