Revert "Subscription Id is associated with the n/w mode"

This reverts commit 28d497f4240633d03db74600099f9be28cb139ad.

Change-Id: I3709582b9a74d12b7d46a668cd50e9fa8de78ae1
2 files changed