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

Change-Id: If2e73e4bfbf0eff0bae1a047e2fc18e33a43692c