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

Change-Id: Ib5d96f7f1053b16a2f2eaedd72550a7b726edbda