Merge "Store elapsedRealtimeNs as int64 instead of long" am: dc51e5ef21
am: dbd03d7f3a

Change-Id: I818bf7d4aef6aef09400b5c975d402282e2c4e3a