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

Change-Id: I02e8d098c966b2c676055b25269a30d576be4849