Merge "Wait for broadcast even if the network state has been changed. bug: 2863356"