Merge "Handle null NetworkState updates" am: ae758b2c7f
am: 4cf8f7a8cd

Change-Id: I47cdb040baed8c4c700ff7412a01d79f8edccbd2