Unsubscribe PartitionQuery, as it will be deleted

Change-Id: Ia6943a759f20c9245d3f42c8bc36107ac755f4bf
(cherry picked from commit 7215e3aa22974535c70d1e561d3fbefe3f7eaa64)
Merge "Unsubscribe PartitionQuery, as it will be deleted" into REL1_23