Unified jf

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