Merge "Handle USB power role 'sink'" into nyc-mr1-dev