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

Change-Id: I041741b309f3eea2b2d55f2dbb7624e9170491a9