Merge "Fix CTS test for AOD metrics" into oc-mr1-dev