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