Manual importation of Android Comms related code into Trial branch