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

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