Merge \"Be pro-active into ensuring a method is JITted in test.\"
am: 616723f67e

Change-Id: I10b9849e15b451cc562461b8663e2279b0aaebf2