am 69e7ca93: (-s ours) DO NOT MERGE TO MR2 2182414 Fix for [RIO-7731] valgrind error in opencore. (cherry picked from commit 89369ebd893c0fd29f72f44b9fed8842cab593bf)

Merge commit '69e7ca934b4ec0e0c383ab6cf51bdf11e7f88137' into eclair-mr2

* commit '69e7ca934b4ec0e0c383ab6cf51bdf11e7f88137':
  DO NOT MERGE TO MR2