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

Change-Id: Icadc77cb7630e61166ab3c9608f60736c24e52c1