Merge "Make Rollback Manager handle time change"