Merge "(Bug 41169) Apply rtrim on on preSaveTransfrom."