d2tfnspr support

Change-Id: Ie326958b2abd4ded503f82e8bbc819917c9bfa93
Merge branch 'cm-11.0' into kk_mkt