Merge "Make test 566-polymorphic-inlining more robust."
am: 476fce3434

Change-Id: If5859f218dd9d2556dc8aa64c1901b0245596446