Switching ContactLoader to the all-encompassing query

Change-Id: Ibcf8ac0db5a10966c4742727f32af54ca1773079
3 files changed