Merge "Fix NPE when querying preferred without an account" am: 3b42bce613
am: a2ce4a099b

Change-Id: I03c8790a6a096bf0fd804e2a3bec0dbd5c5bde42