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

Change-Id: I9bb7d9e9ea8b174ba2fe1d77d110cef658e152c8