Merge "Cleanup polymorphic inlining to the same target." into nyc-dev
am: d8f4547868  -s ours

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