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

Change-Id: Ia8edf1e9d0f49da5be2bac1889cd0001010a869b