Merge "Use uptimeMillis instead of currentTimeMillis for interval calculation." into oc-dev