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

Change-Id: If71c72840bcf7176fbceca91fcab9bcd81955d6b