Merge "MAP MCE iPhone Connectivity" into nyc-car-dev