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

Change-Id: I6b01046c3b91b71718f39bff3c4b956065ab0260