Cornsilk 14 14 acu174925 release5.2 cleanup

@dominicm