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

Change-Id: I479deb4dc114f2f169994501230a882377f1453e