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

* commit '215763fb001b4b9464d27dd1b9b63eff04b4996f':
  Don't use fingerId when creating names