Merge "Bug 1366: Fallback scenario for IdentityCodec to work without schema."