Merge "Mark encodeSmdxSubjectAndReasonCode incompatibilities"