part 2 of LTE toggle support

Change-Id: I21050a18269c15be054e35f5f75fd339e1f270f5