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

Change-Id: If48dc51fe4e01b2e74487d0bf3e8eebb21b346ad