Merge "Don't use fingerId when creating names" into mnc-dev