Merge "Optimize method linking" into lmp-mr1-dev