Update NavigationTiming for cherry-picks

Change-Id: I60ad61df1bd474c65d10a9fcb95ba304fe5c8497