Update NavigationTiming for cherry-picks

Change-Id: I53b58d8bfc8bd2f3008e3d52337f6bef388de0bf