Fixed LT-14370 and FW6 to FW7 migration

Change-Id: I4788efa1853356a4a4c833cccdd8fdd808717b1d