Merge "Use uptimeMillis instead of currentTimeMillis for interval calculation." into oc-dev
am: 776f480c49

Change-Id: I76c22e43e91ae3d92aceaf197ce2860cb0a744d0