NTT fix

Change-Id: Id1d7d747428a26f6f475eff24d11d001bb138261
(cherry picked from commit 15100a917d17c83a10ed4fbfd430855ed46d1070)
(cherry picked from commit 40c9d307f91b0f323d229a065d5e419999fb6cd5)
1 file changed