am 95731abe: am bb7b5197: am cd8e7381: Merge "Fix issue with using locally defined attrs in a shared lib" into lmp-dev

* commit '95731abeae49eac57911068ac8545f4eba2ae58d':
  Fix issue with using locally defined attrs in a shared lib