Merge "Fix ClinitCheck pruning." am: d846a2cc45 am: 5719078766
am: 833002b4f8

* commit '833002b4f8d026309fdcb879d943ffe044dcfe3d':
  Fix ClinitCheck pruning.