Merge "Fix when list function failed at instance IP is "None"" am: 3ecfee4c5e
am: c78d9f940b

Change-Id: Icc2c2b35e1640fc26eeb6231a426995991cadce3