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

Change-Id: I9647bbeea800b9e7d73748474f8c5bb83620df39