Merge "only register jni for ClatCoordinator on T+"