Bug 1045076 - Add sanity check to timestamp handlers and return values
Merge pull request #22272 from eliperelman/bug-1045076-perf-timestamp-failsafe

Bug 1045076 - Add sanity check to timestamp handlers and return values r=hub