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

Change-Id: Ifa4d5bc305bd581f9f7fdbfdfa13b9b8731ece79