Merge "Cleanup polymorphic inlining to the same target." am: fb734b416d
am: a03ff5a388

* commit 'a03ff5a3887a9d413a19fcde40451aa31ccca718':
  Cleanup polymorphic inlining to the same target.