Merge changes from topic "am-1e7935a2-3929-4000-bb19-9e0ff0e29216" into cw-f-dev

* changes:
  [automerger] Fix 'potential memory leak' compiler warning. am: 37c428cd52 am: 2298edf58a am: 56b9616eb4
  [automerger] Fix 'potential memory leak' compiler warning. am: 37c428cd52 am: 2298edf58a
  [automerger] Fix 'potential memory leak' compiler warning. am: 37c428cd52
  Fix 'potential memory leak' compiler warning.