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

* commit 'b226d2951c8641f9851e40b4e13b4ae25cb1a482':
  Revert "Fix issue with using locally defined attrs in a shared lib"