Prepare for jfltexx

Change-Id: I180f376af0713b37ebdaca748c2bf0e388615723