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

Change-Id: I32728b02f241725d1d0351f9610c7593a80b106a