Ununify jf

Change-Id: I8eabc403f33f2d43c6d3e5c256cec77b4cca4f7e