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

Change-Id: I84b71a73a4ad89185732dfb05582c549aab0ba3c