Initial fj commit

Change-Id: Id8900e8d5476a0847fe49217a4197607c487d5fa