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