Merge \\"Revert \\"Handle USB power role \\'sink\\'\\"\\" into nyc-mr1-dev am: ad023e14c2
am: 8f4bb5f199

Change-Id: I835c045edd994ed1244afd24d4ec575e96d268c4