Add support for janice and codina [1/2]

Change-Id: I69edd5a0f6a0e5e63127c98e38444d19ba78abf5
Add support for janice and codina [2/2]

Change-Id: Idbe06471b5460dc8f3454c74812f04f2d62fc1e1