Merge "Fix invalid padding bits for 7-bit ASCII encoding"