Merge "Remove kKeyNalLengthSize"