The MSM_ACA code can conflict with the multiple charger detection
and USB Downstream Charging ports.  Also reenable USB OTG,