am 22986a47: (-s ours) Merge "Optimize method linking" into lmp-mr1-dev

* commit '22986a478eff6562896ab8df187b5cd8cbcb8de9':
  Optimize method linking