am 6eec1ec2: am b5d958af: am 333091ae: Adds support to selecting name preference order

* commit '6eec1ec2978c9b3e68032e5d07347b17e4d5a2d7':
  Adds support to selecting name preference order