Merge "Adds osm-common dependency"