Merge "Fix invalid padding bits for 7-bit ASCII encoding"
am: 2c8d3c56f2

Change-Id: I62692e468732d1de5eba26ddc2a926bb7044e7f2