Merge "Fix elapsed time of tests by using new ddmlib callback" into oc-dev