Merge "Use uptimeMillis instead of currentTimeMillis"