Local jf-common

Change-Id: I5bacab5159a50d9759449f9fd9e6d8ebcfdf8e34