Add support for janice and codina

Change-Id: I0b76703cfe171ba178505c0c99799c57557c3762