Split wall-time and monotonic-time up into 2 interfaces as a stop gap to fix issue in 1.1.x