Merge "InstanceIdentifierCodecImpl JUnit test"