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