Update NavigationTiming for cherry-picks

Change-Id: I75e7b7f514c988cef12ce8aafc1cc5c6b390d982