Merge changes from topic "am-a1557f9d04104ca88b9de9d227902270"

* changes:
  [automerger skipped] Merge "Revert "DO NOT MERGE: Decode the input of both setStream and setResource calls first"" into rvc-dev am: 57095ccb am: 83a82c49 -s ours am: 136021e2 -s ours am: f2c3d1e7 -s ours am: c2b81bd4 -s ours am: b2eb2084 -s ours
  [automerger skipped] Revert "DO NOT MERGE: Decode the input of both setStream and setResource calls first" am: cc4fe898 am: 64479d2d -s ours am: eda5c147 -s ours am: 607c9533 -s ours am: 96a7b3af -s ours am: 707fb462 -s ours