d2tfnspr support

Change-Id: Ie326958b2abd4ded503f82e8bbc819917c9bfa93
d2lte: Unbreak network mode options

Change-Id: Id0235bc9e81c09216c95e8150cb555b263c693af
Merge "d2tfnspr support" into kk
Merge "d2lte: Unbreak network mode options" into kk