Merge changes I03127947,Ic25cb02c into udc-qpr-dev

* changes:
  Add AnimatorTestRule to volume tests
  Clean up volume test handler last