Merge "Bug 4736 - Add null poiner check of getFixedIPs()"