Merge changes from topic "am-79bd281364d74b4582ba0e7399543cb3"

* changes:
  Merge "[automerger skipped] Revert "Decode the input of both setStream and setResource calls first" am: ade248a9 -s ours" am: 3568a7a8 -s ours am: b4cced1f -s ours am: ea45ac7e -s ours am: 466ad68c -s ours am: d9fb1272 -s ours
  [automerger skipped] Revert "Decode the input of both setStream and setResource calls first" am: ade248a9 -s ours am: cf9fb944 -s ours am: 9ee9ac6f -s ours am: 39fead47 -s ours am: 060a8af0 -s ours am: e5b80272 -s ours