Settings now more like maintrack jf-common

Change-Id: Ie3877620b76f2ce8c7ae9487c49f353f05924e76