Merge "Fix onBlockedStatusChanged does not work on multiple networks" am: 289b565dba am: 5465460914
am: d6cb156b31

Change-Id: I11168fd07a7c29e0605f2e874e9d9f41b5ad88b6