Fix USB and capacitive lights

Change-Id: Iced0183e09233b1503b1f0e3e2b4114f781aca45
Merge "Fix USB and capacitive lights" into du44