jf: add loki

Change-Id: Ia14d2be5b395daab7d1a8c7bbbbd1c4034702230
Merge "jf: add loki" into jb-mr1