Merge "Change currentTimeMillis to elapsedRealtime" into oc-dev