Merge "Fix invalid padding bits for 7-bit ASCII encoding" am: 2c8d3c56 am: c302ce55 am: 1a9034d4 am: 66460139 Change-Id: Idac3364a23d0e10b5b93097eddcbbeb7718755ec