Update NavigationTiming for cherry-picks

Change-Id: If9ddfe2f8f0fd8047b3aee0c4aaec155f337d4cf