Adds support to selecting name preference order

Bug: 16467223
Change-Id: I34b4267929cded27cc9f71a7d7c7af5798f84931
5 files changed