Merge "Loosen tolerance slightly in EncodeDecode and DecodeEditEncode tests" into jb-mr2-dev