Fix some corner cases in Network state change support

Change-Id: I14e5ee89a09747914b4782bbcb6d21bfb84ea84d
Signed-off-by: Padmapriya Narayanan <padmapri@qce.qualcomm.com>