Merge "Change currentTimeMillis to elapsedRealtime"