am 435351df: am 827645f2: Merge "Ensure class is linked before resolution" into lmp-dev

* commit '435351df2e13088508146d1009b3e1ebb2c8c409':
  Ensure class is linked before resolution