Merge "Use uptime instead of elapsed for measuring duration" into oc-dev