am e6fd76c2: Merge "Don\'t use fingerId when creating names" into mnc-dev

* commit 'e6fd76c23591c90cc8f8ae64d323e22abf491fdf':
  Don't use fingerId when creating names