Merge "Rename EV_CONNECTOR_TYPE enums" into pi-dev
am: 0e3e580249

Change-Id: I9e8896a88937bf2c31f09eb6507e51fa2a445c78