OTG: more stuffs

Change-Id: Ia3cdb5de6e765ebea5be79a24324b1627aa5d248