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

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