Update NavigationTiming for cherry-picks

Change-Id: Ib8a2c16e19c096bffad922cebdeddd401efbe438