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: 5b27fef4 am: 4d079343 am: 690cc6b2 skipped: c4d80265 am: f294bdbb am: 54ef7ee9 am: ce6884eb am: 5d335dfb skipped: 66c6a114
  [automerger] DO NOT MERGE: Don't reuse buffer when building response am: 5b27fef4 am: 4d079343 am: 690cc6b2 skipped: c4d80265 am: f294bdbb am: 54ef7ee9 am: ce6884eb am: 5d335dfb
  [automerger] DO NOT MERGE: Don't reuse buffer when building response am: 5b27fef4 am: 4d079343 am: 690cc6b2 skipped: c4d80265 am: f294bdbb am: 54ef7ee9 am: ce6884eb
  [automerger] DO NOT MERGE: Don't reuse buffer when building response am: 5b27fef4 am: 4d079343 am: 690cc6b2 skipped: c4d80265 am: f294bdbb am: 54ef7ee9
  [automerger] DO NOT MERGE: Don't reuse buffer when building response am: 5b27fef4 am: 4d079343 am: 690cc6b2 skipped: c4d80265 am: f294bdbb
  [automerger] DO NOT MERGE: Don't reuse buffer when building response am: 5b27fef4 am: 4d079343 am: 690cc6b2 skipped: c4d80265
  [automerger] DO NOT MERGE: Don't reuse buffer when building response am: 5b27fef4 am: 4d079343 am: 690cc6b2
  [automerger] DO NOT MERGE: Don't reuse buffer when building response am: 5b27fef4 am: 4d079343
  [automerger] DO NOT MERGE: Don't reuse buffer when building response am: 5b27fef4
  DO NOT MERGE: Don't reuse buffer when building response