Merge "Bug fix for polymorphic inlining." am: c3bcf40e90
am: f4e977261c

* commit 'f4e977261cbbb4e75f61b5ac5f94764994719c92':
  Bug fix for polymorphic inlining.