Merge "make failure on map creation returns -errno"