Update NavigationTiming for cherry-picks

Change-Id: I27e375c2e94059303e73ccadc88b5ba3fde9645c