Merge changes from topic 'dual_role_chargers' am: 37b939a180
am: 0a3efc2622

Change-Id: I2c0ba36c46674ff7f9a0b963543e271eec93858c