* commit 'bc391d58c8d09bd58b57dda20dd9d2281d90db32': Revert "Fix for bug: #7173350. elapsedRealtimeNano() -> elapsedRealtimeNanos()"
* commit 'bc391d58c8d09bd58b57dda20dd9d2281d90db32': Revert "Fix for bug: #7173350. elapsedRealtimeNano() -> elapsedRealtimeNanos()"