Merge "Fix test failure of 638-checker-inline-cache-intrinsic"
am: d2b31918cd

Change-Id: Ia7d25a0696ddc038555c141534037207a74a43e7