Merge "Limit cached timestamp use if HW fails to provide them" into nyc-dev