Merge changes from topic "am-5ef741693f21420b9c31bc661a7358d2" into sc-v2-dev-plus-aosp

* changes:
  [automerger skipped] Merge "Revert "DO NOT MERGE: Decode the input of both setStream and setResource calls first"" into sc-dev am: 9edf1a71 am: 806633ad -s ours am: e29216c5 -s ours
  [automerger skipped] Revert "DO NOT MERGE: Decode the input of both setStream and setResource calls first" am: 4c5f09ca am: 96c0c34f -s ours am: 6081d24b -s ours