Merge changes from topic "am-8ebb8a51-8136-4dbf-af20-03fc0d742d1b" into oc-dev

* changes:
  Merge commit '35f5d28889f72c6e5883646223c065a757bb4660' into am-8ebb8a51-8136-4dbf-af20-03fc0d742d1b
  Fix dlopen errors caused by 9e7d85dd5ee6366ec11ad6310511de2fb3213cc8