am 45eb58e3: Merge "Loosen tolerance slightly in EncodeDecode and DecodeEditEncode tests" into jb-mr2-dev

* commit '45eb58e3fbc552d364119f436d252b77f5f20ac1':
  Loosen tolerance slightly in EncodeDecode and DecodeEditEncode tests