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

Change-Id: Iba1a8b73c04d5a7ed18aaee44c507c38ec580a7d