Merge "[CTS] Fix oom catcher to remove false positives" into oc-dev