OTG modifications

Change-Id: Ibda290fdd18fbcd02bfb3e90e5a64f284321d605