Merge "MAP: Update API name used during Socket Listening."