am b226d295: am c6a06d43: Merge "Revert "Fix issue with using locally defined...
am b226d295: am c6a06d43: Merge "Revert "Fix issue with using locally defined attrs in a shared lib"" into lmp-dev
* commit 'b226d295':
Revert "Fix issue with using locally defined attrs in a shared lib"