Squashed timestamp refactor (for reference).

Bug: 332662639
Test: npm run test:unit:ci

Change-Id: Ib39341814dc34ebd503b1a427e40fd633ded96b9
137 files changed