Merge "Change BASIC_INFO_EV_CONNECTOR_TYPES ValueType" into pi-dev
am: da0507c14a

Change-Id: If717df859755056436cce2da2ebbc1f137c5a454