Add (corrected) usb power sink handling
am: 9ebf2a5683

Change-Id: I2d7b2bb6be59dea8bd0fec74323f533e9dd7b4ab