Merge "Handling null interface in addLocalNetAccess, removeLocalNetAccess and getLocalNetAccess" into main