Merge "Bug 5179 : Fixing NPE in InterfaceManager"