Merge "Change currentTimeMillis to elapsedRealtime" into oc-dev am: b42205ee9e
am: ad17fd8fda  -s ours

Change-Id: I1481aed438cc531a304acad6e50893ba74c67a35