Merge "Change NN canonical timings to nanoseconds -- hal"