Merge "Rename EV_CONNECTOR_TYPE enums" into pi-dev