[CB,HB]{other} adapted GcmUtil.java