Merge "Fix ClinitCheck pruning." am: d846a2cc45 am: 5719078766
am: 738ebd7db8

* commit '738ebd7db8b9379093196a881793f0abcff20262':