Merge "Bug fix for polymorphic inlining." into nyc-dev
am: 6e578529a8

* commit '6e578529a89dd862fe80283de7433fe17fbe993b':
  Bug fix for polymorphic inlining.