[CB,HB]{other} Some more cleanup, added GcmUtil Test preferences