Merge "Add (corrected) usb power sink handling" into nyc-mr1-dev
am: 7cee8be675

Change-Id: Ie34e32f66df546619ff6c5553223d53d68e491c7