Merge "Fix iCache misses for GetKind on x86,x86_64" am: 6356cadc5f
am: 29c4875e05

Change-Id: I4efceaa972f86dd16e5dadc8c366ca3d8670a181