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

Change-Id: Ibd4b74ea87b4d7a80657ed7e2b49579645018e91