Support for Codina

Change-Id: I9db9dfcbde40d2e50d30f2553b1042f404eafa9e