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

Change-Id: Idd5cf1b8de35cca3a7518d6ed76d87044c8846b4