Unified jf

Change-Id: I63f21eb15edcf0d03dc747a362be57bcc08331ec
Merge "Unified jf" into kk44