OTG part 2

Change-Id: Ie2a5dc5eb55dd6fb43cbb52cb189c71c65919ae8