Merge "Make test 566-polymorphic-inlining more robust." am: 476fce34 am: ad8251ab am: 072049c5 am: cec1a64f Change-Id: Ice01bdd3f55251dd40e7b3d1a03700f0289e1e88