Merge changes from topic "am-7125a1ce-592b-4a1d-a4e0-c6f472d5dc83" into oc-dev

* changes:
  [automerger] DO NOT MERGE: Don't reuse buffer when building response am: e607b1af am: 703d03f2 am: 51f9423d skipped: 7c6500be am: 5348161b am: 2082c803 am: 2b866996 am: 156fe9b3 skipped: 8db88b4c
  [automerger] DO NOT MERGE: Don't reuse buffer when building response am: e607b1af am: 703d03f2 am: 51f9423d skipped: 7c6500be am: 5348161b am: 2082c803 am: 2b866996 am: 156fe9b3
  [automerger] DO NOT MERGE: Don't reuse buffer when building response am: e607b1af am: 703d03f2 am: 51f9423d skipped: 7c6500be am: 5348161b am: 2082c803 am: 2b866996
  [automerger] DO NOT MERGE: Don't reuse buffer when building response am: e607b1af am: 703d03f2 am: 51f9423d skipped: 7c6500be am: 5348161b am: 2082c803
  [automerger] DO NOT MERGE: Don't reuse buffer when building response am: e607b1af am: 703d03f2 am: 51f9423d skipped: 7c6500be am: 5348161b
  [automerger] DO NOT MERGE: Don't reuse buffer when building response am: e607b1af am: 703d03f2 am: 51f9423d skipped: 7c6500be
  [automerger] DO NOT MERGE: Don't reuse buffer when building response am: e607b1af am: 703d03f2 am: 51f9423d
  [automerger] DO NOT MERGE: Don't reuse buffer when building response am: e607b1af am: 703d03f2
  [automerger] DO NOT MERGE: Don't reuse buffer when building response am: e607b1af
  DO NOT MERGE: Don't reuse buffer when building response