Specify a account query uri in a resource, and remove the old receiver Change-Id: Ia04dccfc95e0bb1854bba2e6f51e2de1546d72ce