Update NavigationTiming for cherry-picks

Change-Id: Ie54d81fdbe07c5f32ec1baba5a57348af7766bd4