Unsubscribe PartitionQuery, as it will be deleted

Change-Id: Ia6943a759f20c9245d3f42c8bc36107ac755f4bf
Merge "Unsubscribe PartitionQuery, as it will be deleted"