Merge "[MS41.2] Add unit test for query history APIs"