Merge changes from topic 'dual_role_chargers'
am: 37b939a180

Change-Id: I2b9eda605ae85347eb2e3e4202a6c7ec176778af