Fix for supporting fixed-floating-ip

Change-Id: Ieb51899f68b396ea714a244b24b3b261a0532168
Merge " Fix for supporting fixed-floating-ip"