Support for Codina and Janice

Change-Id: Ic8fbef66199754f4040b2b3edd491d8d053f501d
Merge "Support for Codina and Janice" into kk44