Merge "Store elapsedRealtimeNs as int64 instead of long"