Merge changes from topic "am-b2f392edf061412196627ca584b13a2c" into tm-dev

* changes:
  [automerger skipped] Merge "DO NOT MERGE: WM: Call Transaction#sanitize" into sc-qpr1-dev am: 2e3b77a4 -s ours am: fa4e3642 -s ours am: 53b7192d -s ours
  [automerger skipped] DO NOT MERGE: WM: Call Transaction#sanitize am: d1de60ac -s ours am: bb40e5e7 -s ours am: ef98f337 -s ours