Some Tweaks by PA

Change-Id: I6264634eea03f91fe136a10ab75739e76deb7520
Revert "Enable OTG storage"

This reverts commit be69e4a702253ffe4321463eff875eb699ae4c9c.

Change-Id: I2817befaf82ba20fb509c9f42da14b9948ed61b4