Merge "Fix invalid padding bits for 7-bit ASCII encoding" am: 2c8d3c56f2 am: c302ce55ab am: 1a9034d44e
am: 66460139d2

Change-Id: Idac3364a23d0e10b5b93097eddcbbeb7718755ec