Merge "Do not add FDN if number is not entered." am: f796cf5036 am: ef99ec7646
am: c2c12cfcd2

Change-Id: Idc8764940f169f8a44dc8cb84dba2b60287ff3ba