new fixes to android and pubsub clints