Use my jf-common for now until my pull request gets merged.

Change-Id: I9f257af5b5ce24aecb8d993c45d3f780e30189d8