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

Change-Id: I419395b77528e5a200411b88940e05af310c37d6