Add OTG support & bring inline with cm and madhi