Merge "Merge "Fix NPE on network forget from details page." into oc-dr1-dev am: e59ba746 am: 58b665f4"